From 4d06c3dfb4e402ef685c2538c04106f7a284d9f3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 11 Sep 2025 20:15:25 +0100 Subject: [PATCH] vulkan: Don't emit library_arch if the library_path is just a basename If the library_path is just a basename like `libvulkan_lvp.so`, then we can share the same JSON manifest between all of the architectures, like we already do for Vulkan layers. This is also how the Nvidia proprietary driver works, and how Mesa is packaged in Debian 13. However, this will only work if we don't mark the manifest as being architecture-specific. This partially reverts commit f7aa6ba9 "vulkan: Specify library_arch in ICD files". Signed-off-by: Simon McVittie Reviewed-by: Mel Henning Reviewed-by: Matt Turner Reviewed-by: Eric Engestrom Part-of: Applied-upstream: 26.0, commit:1ec7bc382d13f01371a4255004b2fd4f545739a9 Gbp-Pq: Name vulkan-Don-t-emit-library_arch-if-the-library_path-is-jus.patch --- src/vulkan/util/vk_icd_gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vulkan/util/vk_icd_gen.py b/src/vulkan/util/vk_icd_gen.py index 15adf5f6d..7760dd6b0 100644 --- a/src/vulkan/util/vk_icd_gen.py +++ b/src/vulkan/util/vk_icd_gen.py @@ -75,7 +75,7 @@ if __name__ == '__main__': }, } - if args.sizeof_pointer: + if args.sizeof_pointer and ('/' in lib_path or '\\' in lib_path): bit_width = args.sizeof_pointer * 8 if bit_width in [32, 64]: json_data['ICD']['library_arch'] = str(bit_width) -- 2.30.2